From 3e75c326bb587273c5ea9266157f46bb1475b701 Mon Sep 17 00:00:00 2001 From: alexmot Date: Thu, 18 Sep 2003 21:08:40 +0000 Subject: [PATCH] Remove output data length constraints from OziExplorer format. --- gpsbabel/internal_styles.c | 37 +++++++++++++++++++------------------ gpsbabel/reference/ozi.ozi | 18 +++++++++--------- gpsbabel/style/ozi.style | 37 +++++++++++++++++++------------------ 3 files changed, 47 insertions(+), 45 deletions(-) diff --git a/gpsbabel/internal_styles.c b/gpsbabel/internal_styles.c index 7777360b2..c60f91b74 100644 --- a/gpsbabel/internal_styles.c +++ b/gpsbabel/internal_styles.c @@ -377,6 +377,7 @@ static char ozi[] = "#\n" "# \n" "# As used in ozi.c\n" +"# Modifications 9/18/2003 - Remove printf conversion constraints.\n" "#\n" "DESCRIPTION OziExplorer Waypoint\n" @@ -398,24 +399,24 @@ static char ozi[] = "#\n" "# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n" "#\n" -"IFIELD INDEX, \"1\", \"%4d\"\n" -"IFIELD SHORTNAME, \"\", \"%-14.14s\"\n" -"IFIELD LAT_DECIMAL, \"\", \"%11.6f\"\n" -"IFIELD LON_DECIMAL, \"\", \"%11.6f\"\n" -"IFIELD EXCEL_TIME, \"\", \"%011.5f\"\n" -"IFIELD CONSTANT, \"0\", \"%3s\" # icon \n" -"IFIELD CONSTANT, \"1\", \"%2s\" # 1 \n" -"IFIELD CONSTANT, \"3\", \"%2s\" # display format opts \n" -"IFIELD CONSTANT, \"0\", \"%10s\" # foreground color \n" -"IFIELD CONSTANT, \"65535\", \"%10s\" # background color \n" -"IFIELD DESCRIPTION, \"\", \"%-40.40s\"\n" -"IFIELD CONSTANT, \"0\", \"%2s\" # pointer direction \n" -"IFIELD CONSTANT, \"0\", \"%2s\" # garmin display flags \n" -"IFIELD CONSTANT, \"0\", \"%5s\" # proximity distance \n" -"IFIELD ALT_FEET, \"\", \"%7.0f\"\n" -"IFIELD CONSTANT, \"6\", \"%2s\" # waypt name text size \n" -"IFIELD CONSTANT, \"0\", \"%2s\" # bold checkbox \n" -"IFIELD CONSTANT, \"17\", \"%2s\" # symbol size \n" +"IFIELD INDEX, \"1\", \"%d\"\n" +"IFIELD SHORTNAME, \"\", \"%s\"\n" +"IFIELD LAT_DECIMAL, \"\", \"%.6f\"\n" +"IFIELD LON_DECIMAL, \"\", \"%.6f\"\n" +"IFIELD EXCEL_TIME, \"\", \"%.5f\"\n" +"IFIELD CONSTANT, \"0\", \"%s\" # icon \n" +"IFIELD CONSTANT, \"1\", \"%s\" # 1 \n" +"IFIELD CONSTANT, \"3\", \"%s\" # display format opts \n" +"IFIELD CONSTANT, \"0\", \"%s\" # foreground color \n" +"IFIELD CONSTANT, \"65535\", \"%s\" # background color \n" +"IFIELD DESCRIPTION, \"\", \"%s\"\n" +"IFIELD CONSTANT, \"0\", \"%s\" # pointer direction \n" +"IFIELD CONSTANT, \"0\", \"%s\" # garmin display flags \n" +"IFIELD CONSTANT, \"0\", \"%s\" # proximity distance \n" +"IFIELD ALT_FEET, \"\", \"%.0f\"\n" +"IFIELD CONSTANT, \"6\", \"%s\" # waypt name text size \n" +"IFIELD CONSTANT, \"0\", \"%s\" # bold checkbox \n" +"IFIELD CONSTANT, \"17\", \"%s\" # symbol size \n" ; static char s_and_t[] = "# gpsbabel XCSV style file\n" diff --git a/gpsbabel/reference/ozi.ozi b/gpsbabel/reference/ozi.ozi index bf7266ab2..ea65058c4 100644 --- a/gpsbabel/reference/ozi.ozi +++ b/gpsbabel/reference/ozi.ozi @@ -2,12 +2,12 @@ OziExplorer Waypoint File Version 1.1 WGS 84 Reserved 2 Reserved 3 - 1,GCEBB , 35.972033, -87.134700,25569.00000, 0, 1, 3, 0, 65535,Mountain Bike Heaven by susy1313 , 0, 0, 0, 0, 6, 0,17 - 2,GC1A37 , 36.090683, -86.679550,25569.00000, 0, 1, 3, 0, 65535,The Troll by a182pilot & Family , 0, 0, 0, 0, 6, 0,17 - 3,GC1C2B , 35.996267, -86.620117,25569.00000, 0, 1, 3, 0, 65535,Dive Bomber by JoGPS & family , 0, 0, 0, 0, 6, 0,17 - 4,GC25A9 , 36.038483, -86.648617,25569.00000, 0, 1, 3, 0, 65535,FOSTER by JoGPS & Family , 0, 0, 0, 0, 6, 0,17 - 5,GC2723 , 36.112183, -86.741767,25569.00000, 0, 1, 3, 0, 65535,Logan Lighthouse by JoGps & Family , 0, 0, 0, 0, 6, 0,17 - 6,GC2B71 , 36.064083, -86.790517,25569.00000, 0, 1, 3, 0, 65535,Ganier Cache by Susy1313 , 0, 0, 0, 0, 6, 0,17 - 7,GC309F , 36.087767, -86.809733,25569.00000, 0, 1, 3, 0, 65535,Shy's Hill by FireFighterEng33 , 0, 0, 0, 0, 6, 0,17 - 8,GC317A , 36.057500, -86.892000,25569.00000, 0, 1, 3, 0, 65535,GittyUp by JoGPS / Warner Parks , 0, 0, 0, 0, 6, 0,17 - 9,GC317D , 36.082800, -86.867283,25569.00000, 0, 1, 3, 0, 65535,Inlighting by JoGPS / Warner Parks , 0, 0, 0, 0, 6, 0,17 +1,GCEBB,35.972033,-87.134700,25569.00000,0,1,3,0,65535,Mountain Bike Heaven by susy1313,0,0,0,0,6,0,17 +2,GC1A37,36.090683,-86.679550,25569.00000,0,1,3,0,65535,The Troll by a182pilot & Family,0,0,0,0,6,0,17 +3,GC1C2B,35.996267,-86.620117,25569.00000,0,1,3,0,65535,Dive Bomber by JoGPS & family,0,0,0,0,6,0,17 +4,GC25A9,36.038483,-86.648617,25569.00000,0,1,3,0,65535,FOSTER by JoGPS & Family,0,0,0,0,6,0,17 +5,GC2723,36.112183,-86.741767,25569.00000,0,1,3,0,65535,Logan Lighthouse by JoGps & Family,0,0,0,0,6,0,17 +6,GC2B71,36.064083,-86.790517,25569.00000,0,1,3,0,65535,Ganier Cache by Susy1313,0,0,0,0,6,0,17 +7,GC309F,36.087767,-86.809733,25569.00000,0,1,3,0,65535,Shy's Hill by FireFighterEng33,0,0,0,0,6,0,17 +8,GC317A,36.057500,-86.892000,25569.00000,0,1,3,0,65535,GittyUp by JoGPS / Warner Parks,0,0,0,0,6,0,17 +9,GC317D,36.082800,-86.867283,25569.00000,0,1,3,0,65535,Inlighting by JoGPS / Warner Parks,0,0,0,0,6,0,17 diff --git a/gpsbabel/style/ozi.style b/gpsbabel/style/ozi.style index 6636fcae7..41bd652ab 100644 --- a/gpsbabel/style/ozi.style +++ b/gpsbabel/style/ozi.style @@ -6,6 +6,7 @@ # # # As used in ozi.c +# Modifications 9/18/2003 - Remove printf conversion constraints. # DESCRIPTION OziExplorer Waypoint @@ -27,21 +28,21 @@ PROLOGUE Reserved 3 # # INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE: # -IFIELD INDEX, "1", "%4d" -IFIELD SHORTNAME, "", "%-14.14s" -IFIELD LAT_DECIMAL, "", "%11.6f" -IFIELD LON_DECIMAL, "", "%11.6f" -IFIELD EXCEL_TIME, "", "%011.5f" -IFIELD CONSTANT, "0", "%3s" # icon -IFIELD CONSTANT, "1", "%2s" # 1 -IFIELD CONSTANT, "3", "%2s" # display format opts -IFIELD CONSTANT, "0", "%10s" # foreground color -IFIELD CONSTANT, "65535", "%10s" # background color -IFIELD DESCRIPTION, "", "%-40.40s" -IFIELD CONSTANT, "0", "%2s" # pointer direction -IFIELD CONSTANT, "0", "%2s" # garmin display flags -IFIELD CONSTANT, "0", "%5s" # proximity distance -IFIELD ALT_FEET, "", "%7.0f" -IFIELD CONSTANT, "6", "%2s" # waypt name text size -IFIELD CONSTANT, "0", "%2s" # bold checkbox -IFIELD CONSTANT, "17", "%2s" # symbol size +IFIELD INDEX, "1", "%d" +IFIELD SHORTNAME, "", "%s" +IFIELD LAT_DECIMAL, "", "%.6f" +IFIELD LON_DECIMAL, "", "%.6f" +IFIELD EXCEL_TIME, "", "%.5f" +IFIELD CONSTANT, "0", "%s" # icon +IFIELD CONSTANT, "1", "%s" # 1 +IFIELD CONSTANT, "3", "%s" # display format opts +IFIELD CONSTANT, "0", "%s" # foreground color +IFIELD CONSTANT, "65535", "%s" # background color +IFIELD DESCRIPTION, "", "%s" +IFIELD CONSTANT, "0", "%s" # pointer direction +IFIELD CONSTANT, "0", "%s" # garmin display flags +IFIELD CONSTANT, "0", "%s" # proximity distance +IFIELD ALT_FEET, "", "%.0f" +IFIELD CONSTANT, "6", "%s" # waypt name text size +IFIELD CONSTANT, "0", "%s" # bold checkbox +IFIELD CONSTANT, "17", "%s" # symbol size -- 2.30.2